Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: wiki - page toc and directory support #7225

Closed
wants to merge 48 commits into from
Closed

WIP: wiki - page toc and directory support #7225

wants to merge 48 commits into from

Conversation

Cherrg
Copy link
Contributor

@Cherrg Cherrg commented Jun 17, 2019 •
edited
Loading

This PR

  • add a "List of pages" to internal wiki (page tree). They will be generated with JS like TOC for Wiki Pages #822, so it will be fast and don't burden the server. This feature could be disabled per configuration flag, or inside repository settings.
  • add support for directories inside wiki. Create/update/delete pages works well. If an old page is updated, the file will be moved to subdirectory.
  • allows to read files with nearly all letters, as it is possible to push all via wiki gitrepo.
    • Now it's possible to always access misspelled wikipages, which may be pushed via git. The fallback for old plain file structure is only kept (and used) to support old links inside existing wikipages.
      So there is no priority on rendering old or new file, as it is decided by link.
    • duplicate pages (old structure and new page inside directory, may pushed via git) will be marked red on Page-TOC mentioned above.
      • If there are an file in old and new structure, writing will delete both old files, while delete deletes sequential. First delete call will only delete file in old plain structure.
  • add button 'Abort' to wiki edit and new page
  • fixes issure mentioned in js/index.js line 1139
  • fix 500 error if wiki contains pages with invalid uri encoding (e.g. filename: badescaping%%)

Unlike my last comment on #823 images relative to directory are OK now.

Requires: #7182
As this PR uses some script and css i've added there, it is nessesary to pull that first.
Changes made by this PR could be seen here Compare this PR with #7182
If you read commit messages/names, it should be clear what and why i've done something.

fix #823

Some Images

(Note the list symbol on Small and Mobile in top left corner)

Large Mobile
image image
Small Mobile Open
image image
Light
image image
image

Question

  • Is modules\markup\html shortLinkProcessorFull still working with this? Where is it used? Does anyone know?

Signed-off-by: Michael Gnehr michael@gnehr.de

Cherrg and others added 29 commits June 11, 2019 12:04
@Cherrg
add toc to wikipages and rendered md files
6325510 
see go-gitea#822

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
move style settings from js to css files
0a9fb89 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
fix dark theme border color
0e08aa9 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
change padding on TOC headlines
994bf33 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
add md and wikifile TOC settings to repository options
f60056b 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
handle options on template and update js
a9dce7f 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
Update index.js
e971230
@Cherrg
add float clear element
a889262 
+ reduce js call stack: function -> inline function

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
move TOC settings in app.ini from section 'repository' to 'markdown'
77fb621 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@techknowlogick
Merge branch 'master' into gitea_md_wiki_auto_toc
c8e7b8a
@Cherrg
remove german translation
06238aa
@Cherrg
add configuration flag to set TOC extensions
c486aca 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
Merge branch 'master' into gitea_md_wiki_auto_toc
1417170
@Cherrg
Merge branch 'gitea_md_wiki_auto_toc' of github.com:Cherrg/gitea into…
83e4c6e 
… gitea_md_wiki_auto_toc
@Cherrg
move toc beside markdown container on large screens
588fcca 
>1760px

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
add page toc configuration option and db migrate (TocWikiTree)
8416409 
+ ui + language

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
add js + css to render page toc
8914972 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
add directory structure to wiki pages
9f1c89b 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
rename configuration variables 'markdown' to 'markup'
e91b8c5
@Cherrg
Merge branch 'gitea_md_wiki_auto_toc' into gitea_wiki_page_toc
fba98da
@Cherrg
change wiki 'delete' route to '_delete' like other wiki routes
03fb9d8 
+ add reseverd keyword for delete route

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
add abort button to wiki _edit/_new
138cc94 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
fix relative image paths on wiki
3779af6 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
add path ':page' to '_new' wiki page route
9d50e7c 
this will create a new page on same parent directory as currently shown page

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
FIX bug mentiond in js/index.js:1138
ce56067 
wiki render request was triggered when return back to edit mode

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
fix broken image links on wiki edit page
0f4d6ed 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
add wiki page toc for normal/small and mobile screens
d9883de 
+ add ui elements, script and css
+ automatic resize (js) content cotainer, if toc size is larger than rendered markup

Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
set fixed width on small mobile screens
8dd08af 
Signed-off-by: Michael Gnehr <michael@gnehr.de>
@Cherrg
Merge branch 'gitea_md_wiki_auto_toc' into gitea_wiki_page_toc
89c6b05
@Cherrg Cherrg changed the title wiki - page toc and directory support WIP: wiki - page toc and directory support Jun 17, 2019
@lunny
Copy link
Member

lunny commented Jul 23, 2019

Please resolve conflicts.

@lunny
Copy link
Member

lunny commented Sep 6, 2019

Is this still WIP?

@lunny lunny modified the milestones: 1.10.0, 1.11.0 Sep 15, 2019
@stale
Copy link

stale bot commented Nov 14, 2019

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

@stale stale bot added the issue/stale label Nov 14, 2019
@gsantner
Copy link

gsantner commented Nov 14, 2019 •
edited
Loading

expected to land?

actually TOC is really important for wiki 😅

@stale stale bot removed the issue/stale label Nov 14, 2019
@techknowlogick
Copy link
Member

@gsantner conflicts need to be resolved before this can be merged.

@Cherrg
Copy link
Contributor Author

Cherrg commented Nov 16, 2019

@gsantner
This PR was too bulky and huge, so directory support was extracted from this PR (#7390 + #8891).
I will refactor this when #7182 + directory support are done

@techknowlogick techknowlogick modified the milestones: 1.11.0, 1.x.x Dec 12, 2019
@stale
Copy link

stale bot commented Feb 10, 2020

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

@stale stale bot added the issue/stale label Feb 10, 2020
@lunny lunny added the issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented label Feb 13, 2020
@stale stale bot removed the issue/stale label Feb 13, 2020
@gsantner gsantner mentioned this pull request Feb 19, 2020
Closed
@a96219
Copy link

a96219 commented Jan 6, 2021

Will this feature eventually be released?

@Tanami
Copy link

Tanami commented Jan 7, 2021

would really love to see this feature live

@a96219 a96219 mentioned this pull request Jan 29, 2021
Closed
12 tasks
@vwbusguy vwbusguy mentioned this pull request Sep 14, 2021
Closed
@SieDa SieDa mentioned this pull request Oct 20, 2021
Open
@lunny lunny mentioned this pull request Jan 12, 2022
Open
6 tasks
@vwbusguy vwbusguy mentioned this pull request Jan 20, 2022
Closed
@psykro
Copy link

psykro commented May 24, 2022

Hello,

Do you know when this feature is planned ?

Currently having all wiki pages on the same folder make it unusable for large projects.

@ehrenfeu
Copy link

Gitea 1.17 has support for TOCs (see #19873), so this PR here is probably partially obsolete.

However, I would REALLY love to see the folders feature! ❤️

@lunny lunny removed this from the 1.x.x milestone Mar 20, 2023
@wxiaoguang
Copy link
Contributor

It has been stale for a long time and I can't think of a way to handling it other than closing it. Feel free to reopen if there's any new progress and I could also help.

@wxiaoguang wxiaoguang closed this May 1, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Hierarchy (sub directory) in Wiki